#!/bin/bash

git checkout develop
git add .gitignore README.md
git add -f gitsync.sh
git add user.sh mklivecd.sh
git add make-ubuntu-livecd.sh
git add ubuntu-jammy-mate.sh
git add ubuntu-focal-mate.sh
git add ubuntu-trusty-mate.sh
git add mkiso.sh mountx.sh umountx.sh update-livecd.sh ubuntu-trusty-mate.sh openmediavault.sh
git add -A  cdimage/ tools/
git add -A deepin-livecd-update/
git commit -m "ubuntu lived"
git pull --rebase origin develop
git push origin develop

if [ "`uname -a | grep -i ubuntu22`" != "" ]; then
	echo "merge branch ubuntu livecd "
	git checkout master
	git merge develop master -m "merge branch"
	git push origin master
	git checkout develop
fi

#$ git clone  git@gitee.com:redbrother/make-ubuntu-livecd.git
#$ git remote add origin git@gitee.com:redbrother/make-ubuntu-livecd.git
